Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Thu, 16 May 2013 13:22:55 +0000 (16:22 +0300)
committerEli Zaretskii <eliz@gnu.org>
Thu, 16 May 2013 13:22:55 +0000 (16:22 +0300)

Trivial merge